various timing and aesthetic changes mostly