fixed exceptions in Core.java
Minor fixing after Pulling
deleted temp code
Merge branch 'dev' of https://github.com/alexYer/TempCannon into dev