Improvements no. 3 + Bug fixes

Adds some improvements. Fixes #4.