Add comments, tweak fixed width