fix some issues and add more apps