Map collision and other small buggfixes