fixed a bunch of little things