Fixed minor issues with wrong step being active