cleaning up some old commented-out code, adding some todos