REMS and library updates
Added rem-calc dependency