working on remaining FOLLOW note issues