Continuing cleanup

Timer filtering

partially implmented formating changes etc ..