bugfixes n stuff