Fixed all but 1 error