Almost everything has calcium in it. As far as the two together go with dolomite lime. It supplies cal and mag. You can pick up a 40lb bag for 5 bucks at lowes or Home Depot.
1 cup/ cu ft soil and you shouldn't see anymore defs. If that doesn't work like banana said, throw some Epsom salts in there, won't hurt anything.