Improved forin filtering detection, added options to varname

I'm still new-ish to github so if there are any issues here let me know and we can talk.