cleanup gjoll.h and add some const