EP 54 to 1:15, minor tweaks elsewhere