fixed rest of errrors