improve tracking (fixed bugs) and improve GUI