Again some corrections. Please take note of the todos.