tweaks comments + ns