A bit more work on gl wrapper.