BitVC improvements