RC-0.9.3

Bugfixing, code-cleanup