Project Milestones & Comments + some fixes