Comments and TODO tidy up

Updated comments and TODO info in the source file