Cleanups and TODO's ...