Fewfix

include AAT Task ETE fix for PG/HG mode and few others ...