fix all the errors on develop