Bugfixes and demanded Changes #1