added cors, clean up module imports