Pull Zach's changes (tweaks and gerbers)