A few remote fixes, additional feedback