Tweaks, bugfixes, rendering change