Added improvements but still minor model bugs.