Render refactor (with couple of fixes)

Humm, ok!