various updates

Updates to the main, adding some functionality to load and update