Merge pull request #15 from Callum-/master

fixed some errors
Merge pull request #16 from Callum-/master

Changes
Removed more incorrect v's
fixed stuff