[TODO] a few more things I remembered