small changes in presentation
fixed parsing of constant with comment between size and value