Fixed some things, added some tracking docs