Stuff and bugfixes