Carter updates and tweaks