Add comments, server disconnexion and source path