gglparse fix and small other fixes