Minor changes and added tracker.go
Minor changes