updated with a few new initial conditions and diagnostics, nothing major