new ripple with lots of Josh's bugfixes