Fixed drawing order an matrix stuff.