maint: some more TODO items