Comments and minor refactoring of Vicon files.