fix lots of small things