Clarifies user interface, closes #33

Also cleans up some code.