Added more corrections