Closes Issue #10

Fixes robot collision, along with other minor enhancements.