Fixed broken GLDEFS and small DECORATE issues, moved some stuff around