More Valentine’s and a Few Improvements