Merge "tweak the electron beam animation a bit" into klp-dev