Stepping on and in stuff plus clean up

Tags