various updates and changes; updated deps