More error strings and some cleanup.