Tracking and answers changed
Minor fixes