Comment out new square root algorithm for lack of performance gain; miscellaneous fixes
misc. fixes