fixes and updates from main branch