fixed awesome stuff
Style fixes.
minor cleanup
Transitioned more components to use global variables.
More variables.
misnomer..
Misnomer.
Merge pull request #1 from aaronhamilton/master

BUENO...