Some TODOs added and fixed mixed indent.