Bugfixes and shit