fixing up tracker behavior and tweaking some UI stuff