WIP: minor comments