fixed a bunch of little quirks