Minor updates.
Partially added tracking model. Other minor changes.