fixes 1,3,5,6,7