minor tweaks and lintage