Add quality trim skip + some minor changes.