- merge of various updates by Amit Kulkarni and dlg@ - this has an API change, to be dealt with in forthcoming commits