feature/echo branch 

includes some necessary bug fixes for txscapy