Added Better Map, Fixed Reader Issue