AppMan improvements...