fix some salvatore stuff