Fix serious indexing bug with sim macro

- Beam momentum and sqrts were not being set properly
- Slight improvemnt to steering macros