Fix comments, small tweaks