Content cleanup and error code addtions