add trait steppee and fix variable names