fixes safe bug, adds some drawing controls
A tiny bit of cleanup
Merge pull request #28 from jbbrokaw/bugsquash

Bugsquash