Improved the painting a bit, needs much more