further GA tweaks