More reworks and progress updates