fixed a lot of little stuff