added more fields to yearly data
added script to import general data