fixed some stuff after testing the app