comments and TODO tweaks