WIP - fixing location & vhost dependency and declaration confusions