profiling & increased performance; clean up renderer a bit