fixed a lot of small things