I'm getting errors trying to actually use Curve encryption. Improve debugability
Merge missing pieces