Some cleanups, start working on spell system.