first corrections, a lot more to do!