Fixes issues 1 & 5 plus minor cosmetic stuff

Hi,

I believe this fixes issue #1 & #5, plus a few typos, a .gitignore etc.

Cheers,
Andrew McMillan.