Changes, some bfg cleanup, and missed effective_* calls.