Several bugfixes and improvements.

If anything is wrong or if you want to share suggestions, please let us know via email:

[email protected]