Curebit fixes

cc / @yields @ianstormtaylor 

not the cleanest integration since it's a gnarly api, let me know if anything needs fixing.