Small Tweaks

So far this addresses issues:
- #12 
- #13