Centralize unlock_api_key

also do a buncha silly edits