Fixed after merging with Master
Fixed some spells