Updated the application after doing some testing with the server, fixed several bugs