1. smart_selection fixed
2. random logs commented
3. some cleanup