final add of everything for minor tweaks