Some fixes, tests with new changable_socket (not ready) etc.