fixing paths
split up and extended value stuff