many little corrections, not done yet