Some updates and cleanup

While searching for the mysterious VIET CTD...