editted comments and added TODO