add TODO maps; clean up breakpoint map