some more small changes on the way suffixes handled