Added option to suppress coordinate output and refinded thresholds