Tad cleaner

Doing tweaks for full render system.