Merge pull request #250 from travisbrown/master

A lot of batch corrections and additions