improve tracking
fix tracking bugs
add guidetime option