some updates to please the spellchecker