misc snippet tweaks