ENH: various updates