Fixed te C2E function
Fixed minor bugs