Clean up code and fix compile errors
Fix jd-gui weirdness in Hero
hashCode() changes

 These may need review later