CORS fixes
More error checking in case something goes wrong
Logging functionality