fixing errors, not done