Speed and normal fixes in calc thread
Additional output comparison