Tidying, bug fixes, obliterating Z and angles