changes to mapping, networkings, and raytracing
completing merge