Moved first/follow adders to Rule, auto update Variables. Fixed ambiguous sample.