Fixes

Fixed Bug app not exitting
Some more fices