17th commit

Some final changes before I leave VideoRay