Warden and improved random movement generator again

Bugged first time? yes it was!