Updated samples, made qtrim optional