fixed resolveNight; also cupid works