More organization and tweaks.