Added self references and a goto function
Fixed charFollowingPlaceholder function
Merge branch 'productions'