Bugfixing & Codecleaning