A few formatting tweaks to filenames and log output