improved url handling and more admin stuff