Corrected comments by Martin

Added some todo's where I felt the task as too much for a simple
correction. Smaller sections has to be added. Please look at the
sections that you have written at look at the todo's.