BKP: 1.0 - update webservice and fix bugs