minor changes
merging
got the reflections working correctly, woohoo. Need to get this damn cubemap to work now....