Minor changes

Hi Daniel, thanks for putting this up!  I've made some changes for my own sake and figured I'd share them with you if you're interested...