Added cache reset for tracking goals
Fixed minor issues