cleaning up index a bit
put in latest build, added in a wrapper for timers