Misc data grabber improvements
Fixed new bug in checking inputs