Cleaned up DataList,bughunting