Minor bugfixes and movearound