bug fix, update model implementations