Comments and TODO update