Updated some bugs in the application