modified tracking routine to fix inconsistency
modified definition of g1_ray
added timer to to time file loading
merging