worked on cleaning up errors