Added points for #139
Also cleaned up main map and masjid events