diff --git a/.travis.yml b/.travis.yml
index a27f5b9..e430b99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ addons:
         - python3-pip
 
 before_install:
-        - echo === before_install
         - sudo locale-gen "en_US.UTF-8"
         - export LANG="en_US.UTF-8"
         - source .github/travis/common.sh
@@ -23,7 +22,6 @@ jobs:
   include:
     - stage: SymbiFlow
       install:
-            - echo === stage symbiflow install
             - export INSTALL_DIR=$PWD/../opt/symbiflow/xc7
             - tuttest xc7/README.rst xc7-setup-toolchain | bash -ex -
 
diff --git a/README.rst b/README.rst
index eb6a79a..e6cf601 100644
--- a/README.rst
+++ b/README.rst
@@ -66,27 +66,27 @@ and so you will need to add some ``sudo`` commands to the instructions below.
 * For the Artix-7 devices:
 
 .. code:: bash
-   :name: xc7-setup-toolchain
+        :name: xc7-setup-toolchain
 
-   bash conda_installer.sh -b -p $INSTALL_DIR/xc7/conda
-   source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
-   conda env create -f xc7/environment.yml
-   conda activate xc7
-   wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/xc7/install
-   conda deactivate
+        bash conda_installer.sh -b -p $INSTALL_DIR/xc7/conda
+        source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
+        conda env create -f xc7/environment.yml
+        conda activate xc7
+        wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/xc7/install
+        conda deactivate
 
 * For the EOS S3 devices:
 
 .. code:: bash
-   :name: eoss3-setup-toolchain
+        :name: eoss3-setup-toolchain
 
-   bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
-   source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
-   conda env create -f eos-s3/environment.yml
-   conda activate eos-s3
-   wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3
-   cp -r $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/yosys/* $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/
-   conda deactivate
+        bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
+        source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
+        conda env create -f eos-s3/environment.yml
+        conda activate eos-s3
+        wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3
+        cp -r $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/yosys/* $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/
+        conda deactivate
 
 Build Example Designs
 ---------------------
@@ -111,50 +111,50 @@ Before building any example, set the installation directory to match what you se
 and prepare the environment:
 
 .. code:: bash
-   :name: xc7-prepare-env
+        :name: xc7-prepare-env
 
-   # adding symbiflow toolchain binaries to PATH
-   export PATH="$INSTALL_DIR/xc7/install/bin:$PATH"
-   source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
-   conda activate xc7
+        # adding symbiflow toolchain binaries to PATH
+        export PATH="$INSTALL_DIR/xc7/install/bin:$PATH"
+        source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
+        conda activate xc7
 
 To build the counter example, run any or all of the following commands:
 
 .. code:: bash
-   :name: xc7-counter
+        :name: xc7-counter
 
-   pushd xc7/counter_test && make clean && TARGET="arty_50" make && popd
-   pushd xc7/counter_test && make clean && TARGET="arty_100" make && popd
-   pushd xc7/counter_test && make clean && TARGET="basys3" make && popd
+        pushd xc7/counter_test && make clean && TARGET="arty_50" make && popd
+        pushd xc7/counter_test && make clean && TARGET="arty_100" make && popd
+        pushd xc7/counter_test && make clean && TARGET="basys3" make && popd
 
 To build the picosoc example, run the following commands:
 
 .. code:: bash
-   :name: xc7-picosoc
+        :name: xc7-picosoc
 
-   pushd xc7/picosoc_demo && make && popd
+        pushd xc7/picosoc_demo && make && popd
 
 To build the litex example, run the following commands:
 
 .. code:: bash
-   :name: xc7-litex
+        :name: xc7-litex
 
-   wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py
-   chmod +x litex_setup.py
-   ./litex_setup.py init
-   ./litex_setup.py install
-   wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
-   tar -xf riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
-   export PATH=$PATH:$PWD/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14/bin/
-   pushd litex/litex/boards/targets && ./arty.py --toolchain symbiflow --cpu-type vexriscv --build && popd
+        wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py
+        chmod +x litex_setup.py
+        ./litex_setup.py init
+        ./litex_setup.py install
+        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
+        tar -xf riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
+        export PATH=$PATH:$PWD/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14/bin/
+        pushd litex/litex/boards/targets && ./arty.py --toolchain symbiflow --cpu-type vexriscv --build && popd
 
 To build the linux-litex-demo example, run the following commands:
 
 .. code:: bash
-   :name: xc7-linux
+        :name: xc7-linux
 
-   pushd xc7/linux_litex_demo && make && popd
-   pushd xc7/linux_litex_demo && TARGET="arty_100" make && popd
+        pushd xc7/linux_litex_demo && make && popd
+        pushd xc7/linux_litex_demo && TARGET="arty_100" make && popd
 
 Example design for the EOS S3 devices:
 **************************************
@@ -168,16 +168,16 @@ Before building any example, set the installation directory to match what you se
 and prepare the environment:
 
 .. code:: bash
-   :name: eoss3-prepare-env
+        :name: eoss3-prepare-env
 
-   export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
-   source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
-   conda activate eos-s3
+        export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
+        source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
+        conda activate eos-s3
 
 To build the example, run the following command:
 
 .. code:: bash
-   :name: eoss3-counter
+        :name: eoss3-counter
 
-   pushd eos-s3/btn_counter && make && popd
+        pushd eos-s3/btn_counter && make && popd
 
diff --git a/eos-s3/README.rst b/eos-s3/README.rst
index 0d769a0..e379617 100644
--- a/eos-s3/README.rst
+++ b/eos-s3/README.rst
@@ -27,15 +27,15 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u
 .. toolchain_include_begin_label
 
 .. code:: bash
-   :name: eoss3-setup-toolchain
+        :name: eoss3-setup-toolchain
 
-   bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
-   source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
-   conda env create -f eos-s3/environment.yml
-   conda activate eos-s3
-   wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3
-   cp -r $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/yosys/* $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/
-   conda deactivate
+        bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
+        source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
+        conda env create -f eos-s3/environment.yml
+        conda activate eos-s3
+        wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3
+        cp -r $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/yosys/* $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/
+        conda deactivate
 
 .. toolchain_include_end_label
 
@@ -53,17 +53,17 @@ Before building any example, set the installation directory to match what you se
 and prepare the environment:
 
 .. code:: bash
-   :name: eoss3-prepare-env
+        :name: eoss3-prepare-env
 
-   export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
-   source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
-   conda activate eos-s3
+        export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
+        source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
+        conda activate eos-s3
 
 To build the example, run the following command:
 
 .. code:: bash
-   :name: eoss3-counter
+        :name: eoss3-counter
 
-   pushd eos-s3/btn_counter && make && popd
+        pushd eos-s3/btn_counter && make && popd
 
 .. build_examples_include_end_label
diff --git a/xc7/README.rst b/xc7/README.rst
index a3b5f48..3c4758b 100644
--- a/xc7/README.rst
+++ b/xc7/README.rst
@@ -35,14 +35,14 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u
 .. toolchain_include_begin_label
 
 .. code:: bash
-   :name: xc7-setup-toolchain
+        :name: xc7-setup-toolchain
 
-   bash conda_installer.sh -b -p $INSTALL_DIR/xc7/conda
-   source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
-   conda env create -f xc7/environment.yml
-   conda activate xc7
-   wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/xc7/install
-   conda deactivate
+        bash conda_installer.sh -b -p $INSTALL_DIR/xc7/conda
+        source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
+        conda env create -f xc7/environment.yml
+        conda activate xc7
+        wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/xc7/install
+        conda deactivate
 
 .. toolchain_include_end_label
 
@@ -60,49 +60,49 @@ Before building any example, set the installation directory to match what you se
 and prepare the environment:
 
 .. code:: bash
-   :name: xc7-prepare-env
+        :name: xc7-prepare-env
 
-   # adding symbiflow toolchain binaries to PATH
-   export PATH="$INSTALL_DIR/xc7/install/bin:$PATH"
-   source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
-   conda activate xc7
+        # adding symbiflow toolchain binaries to PATH
+        export PATH="$INSTALL_DIR/xc7/install/bin:$PATH"
+        source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
+        conda activate xc7
 
 To build the counter example, run any or all of the following commands:
 
 .. code:: bash
-   :name: xc7-counter
+        :name: xc7-counter
 
-   pushd xc7/counter_test && make clean && TARGET="arty_50" make && popd
-   pushd xc7/counter_test && make clean && TARGET="arty_100" make && popd
-   pushd xc7/counter_test && make clean && TARGET="basys3" make && popd
+        pushd xc7/counter_test && make clean && TARGET="arty_50" make && popd
+        pushd xc7/counter_test && make clean && TARGET="arty_100" make && popd
+        pushd xc7/counter_test && make clean && TARGET="basys3" make && popd
 
 To build the picosoc example, run the following commands:
 
 .. code:: bash
-   :name: xc7-picosoc
+        :name: xc7-picosoc
 
-   pushd xc7/picosoc_demo && make && popd
+        pushd xc7/picosoc_demo && make && popd
 
 To build the litex example, run the following commands:
 
 .. code:: bash
-   :name: xc7-litex
+        :name: xc7-litex
 
-   wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py
-   chmod +x litex_setup.py
-   ./litex_setup.py init
-   ./litex_setup.py install
-   wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
-   tar -xf riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
-   export PATH=$PATH:$PWD/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14/bin/
-   pushd litex/litex/boards/targets && ./arty.py --toolchain symbiflow --cpu-type vexriscv --build && popd
+        wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py
+        chmod +x litex_setup.py
+        ./litex_setup.py init
+        ./litex_setup.py install
+        wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
+        tar -xf riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14.tar.gz
+        export PATH=$PATH:$PWD/riscv64-unknown-elf-gcc-8.1.0-2019.01.0-x86_64-linux-ubuntu14/bin/
+        pushd litex/litex/boards/targets && ./arty.py --toolchain symbiflow --cpu-type vexriscv --build && popd
 
 To build the linux-litex-demo example, run the following commands:
 
 .. code:: bash
-   :name: xc7-linux
+        :name: xc7-linux
 
-   pushd xc7/linux_litex_demo && make && popd
-   pushd xc7/linux_litex_demo && TARGET="arty_100" make && popd
+        pushd xc7/linux_litex_demo && make && popd
+        pushd xc7/linux_litex_demo && TARGET="arty_100" make && popd
 
 .. build_examples_include_end_label