Added MarkerWrapper context for markers' event handlers. Minor fixes.