updates from P880-dev source