tweaks, address comments