some small things that will probably give everyone merge conflicts