analysis builder updates and tweaks