Fixed GA bugs
Tidied Repo