bugfixes and other stuff
merging is fun