Fixing up hardcoded ar
general cleanup of uninitalized and unused variables
Merge pull request #9 from MattBBaker/master

Cleanup