Finished TrackController queries.
Preparing for commit to subversion.
Applied automatic formatter to some files.