small clean in app
small fixes and back to random