fixed more app bugs