A few more fix ups and a context menu feature.