Added psychic items to wizard's tower, added focus to spellbook.

Plus a commit from master.