minor restructure for hybrid rendering, update to latest wade