Fix vertical wrapping and keywait