Merge various updates from @explorigin