Added a few more TODO-s that may arrive relatively soon