Added vncviewer function for MSF and minor cleanup