Added User Agent
Bug fixes