fixed the last two points in 3rd milestone