cleanup yucky client side code
make server faster
Merge branch 'master' of github.com:naartjie/DosBurrosDeLaMuerte