fixed some bugs in the app