fixed some issues with calc readiness