API key support; minor formatting