auto time stepping
minor tidying