main: change some GS field types, added comments