Various changes to allow cubed worlds