updating app and fixing bugs