add valuechangelistener to change dataset of computer based on tenant + remove touchkit + extra errorhandling