Added trait Potent Spirit, plus minor changes