Comment box fix

Give this a onceover and merge pls @robguthrie