fixes, improvements + TGM