GL rendering fixes + cleanup