added additional comments and TODOs