Head Fix Up
More Tidy And Efficient Code
Merge pull request #1 from joesweg/master

A few fixes