a bunch of minor changes after feedback from @joedragons