Tidied up collision detection, added out of bounds constraints and landed detection