fixed String values, added locations to map