added additional columns
some cleanup
Merge branch 'master' of github.com:wittleElf/basicSite