More bugfixes and less chaotic rendering