various updates... seems fairly stable now