Further work on different layer types and level rendering.