fixed lots of little things