comment code, small tweaks