did some small TODOs