lots of small corrections