Added cors, fix bugs with naming