Fixed input edges, and added initial CBD to Himesis converting