updated app following test with precious
fixed some issues from test session