updating default errors, and some cleanup