Renamed ssh-key to identity-file and fixed minor bugs