Add TODO's for some minor bugs.