Some TODO comments as reminders for changes I might like to make later, time-permitting.