Develop

Not sure why I thought I was going to gitflow this. no point, really. fixes the two things I was really wanting.