updates to rust master and spellck