Filename change and minor tweaks