Refactoring the quad image rendering side to match the 2d rendering / vice versa. Fixed also couple of bugs / typos / etc.