Bugfixing item 2&3