Remainder of fixes when testing from scratch and improve webservice
deploy using rsync