adding wrap and minor tweaks