Fixed too many affixes problem, few other fixes here and there