skybox plus other fixes