minor tweaks. I also gave up on a nice file naming convention