Add a few more TODOs here and there