fix more issues with world and opaques
merge