r553 - Fixing startup issues

Was some bugs due to new jar required to be in the classpath and a reobf issue.

With Maps - http://www.mediafire.com/?5ip72ek44bva8t4
No Maps - http://www.mediafire.com/?e63wn6i5874dc8v