Some fixes + auto added for ssh monitoring