more calc fixes
more calc fixes