various updates, syncing before larger change