More freshsh tweaks