Fixes from Gilbert's Model
Merge branch 'cliffsBranch2' into devel