Adding multiple obstacle types
Cleaning up