Added the rest of apps, changed a few lines elsewhere.