Bugfixes .. works for now :)