test fix - blocking issue
Selector usage fix - reduced cpu load alot.