Finish work on calculations

also add calculations_short.m