Further improvements on SSH Connectivity and Tailing mockup