minor changes, apikey moved to config