Sprucing up the place

Made stuff neater, added a few args, fixed a few things.
Merge pull request #15 from Xeom/patch-5

Sprucing up the place