Renamed 'primitive' to 'p' in gear_value struct.  Also fixed issue with given an exception a file name if deeply nested.