Major changes to branch
Merge branch 'nifhleim'
Slight changes to relfect behavior on gilgamesh.