Improve CORS and add some notes