minor tweaks so ready for apikey
apikey shenanigans