checking off some TODOs