Fixed issues #71 and #72 as well as adding and improving a handful of
other things.