more improvements
Merge branch 'master' of github.com:chk1/eggtracker