finished some minor TODOs