Clean up defaults
Fix urls