cleanup properly, and add a couple todo's