fix various errors 3