took care of some TODOs