Many tweaks

Comment options, use \w for wide