more fixes so that valid GDL code is written