fix members saving
various updates