Added some data cleaning/filtering stuff.