Uncomment some code
GL3, header fixes, macro changes, etc.