Minor fix: app name
Fix bugs