Academy Update

Fixes some broken wiring
Adds some of the new wizard items and some other misc items around.