Mild cleanup and added spells