final fixes till assignment 2