Added skybox, refactored some parsing code