added GA and minor cleanup