minor tweaks to timer