Fixed infinite loop when disconnecting
Added near future goals