Merge pull request #1 from goakley/master

Made a number of minor fixes (be gentle, sorry if stepped all over stuff, but the functionality's quite similar!)