various updates.  horrible commit message.