a bunch of commits I hadn't done

a bunch of commits I hadn't done