Fix rate limit err, split origin and add stuff

Fix rate limit err, split origin and add stuff #99