tweaks and add ability to remove api keys