many fixes
Merge pull request #8 from acbrewbaker/master

many fixes