Fix some things
Fix insidious variable ignore bug