Minor fixes, waiting for calculate function