Some performance fixes
Merge branch 'development' of github.com:tapiSoft/tapiBombers into development