various fixes 
spells import almost done