Added token key
changed ip retrieval method
cors enabled
merged + changes