Variable and comment updates