colving issues and compleating the app