some manual fixes in source and latest results