fixed some bugs in GA