removing TODOs, adding/correcting code documentation