Fixed lots of small bugs with step and trace formatting, also print variables.