Grammar updates for constants.
Added error message handling