more minor tweaks and file naming changes