* GA and other minor fixes