Corrections

Part 2

(this is on the rebased branch)

Please check the TODO lines