Render refactor (with couple of fixes)

Maybe, it's very minor though. Let gama do it :-P