more small changes

-committing slowly because I am checking that everything works before
moving on