added apps, improved stubbing