Minor yet radical performance / accuracy changes