lots of other little fixes