fixed suffix
some fixes