Merge rippled improvements

the streams have been crossed, may as well put them together as one again