various fixes, 200 out of 2345