Little Bugfixes, cleaned code