new files, minor tweaks