More ESIL fixes, fix 'so' and add sg/sG