pick a few of the changes we made at work back into my fork