lots of updates to allow better plotting with signal