Integration focus

Some mostly minor tweaks; feedback welcome.