finished corrections on various functions for new model