cleaned up some stuff... added nice timer