Improving on the GA setup
Merge branch 'ga-improvements'