Th updates

Working through some issues