few updates due to kevoree modifications
few updates due to kevoree modifications