fixed 11 errors