improved extrapolation, changed some interfaces, bug fixes