Corrected some issues, added analytical tracking.