fixing all sorts of dumb errors to get it back to compiling