various updates, and bug fixes.