A few tweaks to rendering (more to come tomorrow)