Minor changes + Milestone4 presentation