Render refactor (with couple of fixes)

This can't be right, all of these are returning the same?