Fixed a couple more mistakes.. Can't figure out why the one map comes pre-initialized with an entry which has a cvalue that causes and ClassCastException when retrieved.