Changes to classState map to use IEntityClass name as key now. Also debug logs sprayed around some methods for more visibility if required while debugging.