CORS still not working.. just some minor changes