Added more filtering, data massaging and plotting