Redoing Fixes. 

All done except changes to firestone ore and addition of EntitySpawning.java