fixed a few things in app