Bugfixes n stuff