fix more wrap styles and generalize