bugfixes and stuff
removed conflicts :D