Better dev toolchain

* Fixes issue #1 
* Fixes issue #2