hacking on BP, fixing lots of things