rebuild to incorporate wrap fixes sans jquery