Tightened up some gems.
Preventing moving around using ^W.