added couple TODOs