More rendering tweaks and some caching.