Comment updates and resolving issues after merge with main branch