a lot of small corrections