formatting, state fixes for 3.8.9.5, added purchase step param