Some errors fixed. Whoops.
using a switch statement! We can learn!
closes #461
update the docs!