conn now cleaned up with die, find function added
reflects source updates