very minor fixes, added context menu code