Added cortex and raymarch
Fixed merge issues