Avoiding conflicts
Working through collision handling a bit more, still need better
handling of dimension scaling.
Tad bit more safety
minor adjustment of skybox functions
lazy fix to skybox artifact
Merge update