Make all function names, errors consistent, comment some add_error statements