Update AppMain

Regular edits