Added GA, fixed some files