code refactor
bug fixes
Merge branch 'master' of github.com:Multiagents/applethrower