Many fixes, mainly java doc uneeded dashes and runnable stuff

Amend 1. fixed extra lines and unused imports in shock animation.
Merge pull request #20 from ConnorStone/Fixes

Many fixes, mainly java doc uneeded dashes and runnable stuff