Fixed slayer's mess somewhat. still needs packet handler