improved map, moved things into files , broke event details