minor changes, samlping still wrong