more O/C tweaking, fb fix