Resolve "Minor bugs"

Closes #61 (closed) \ There is one more 'bug' that needs to be fixed from issue 61. I would suggest to open a new issue (or at least a new branch) to deal with that so that we can for now finally integrate all the other fixes on branch 61.