new drawables - no more gldraw + other refactorings