Holy typos, Batman! Also, updated to-do