Camera and Border

Plus a bit of key changes. Might want to use variables so it can be
freely changed at will...

Improved collision detection

Other small touches