Draw observer session on map; code cleanup and bug fixes