Added data and fixed some bugs in extract_data.py