continued rework
cleanup gateways
gateway testing & bug squashing