Previous forgotten files added, better data filtering, and data parsing.