Improved blocking

Also improved reconnect and sorting