Cleaned up and added more details @ milestones.