fixed bug with last data item, and added some possible fields