add GA and same bugfixs