some bugfixes and moving around