changes with zach
f u ray for this merge
tweaks