fixed some issues - still wrapping problems