fixes and add Google Gateway