fixes
url
path
path
fix map
remove obsolete code