minor tweaks. finalizing variables. made FlatMapStep slightly faster again.