Fix improve context

* Closes #10 
* Closes #15 
* Closes #16