added new calculators
switch to rauth and fixed bugs