call and capi added; minor updates