finished tracker, cleaned up code.