further refactoring, fixed Loki-Valkyrie interaction, but sorta broke Fenrir