Fixed some of the issues on the pull request, still a lot of work to do.
Fixed some of the issues on the pull request, still a lot of work to do.

niclabs/tchsm-libdtc,niclabs/tchsm-libdtc,niclabs/tchsm-libdtc,niclabs/tchsm-libdtc