Fixed a vcouple different bugs with the app