- apikey improvments
finished handling with api keys