Fixing bug in "calc", comments added