final commit after first round of errors