updates from arco and system.prop changes