Render refactor (with couple of fixes)

ok, i'll change them to "from" methods