Improves url handling and documentation