fix several of the stupid errors