various updates, fixes, and additions