Bugfixing

so many commits for just this...