Bug correction - wrong indices. Minor threshold changes.