fix various errors 2