2D output, some fixes in core classes and shader.