Fix some expressions and enable comment function