Changes to bullet behavior, added a bunch of fixes that you never pulled