Updated to newer changes in GLDR
Updated the main code to use some of these features