 - fix issues
 - rename app
