Fix the sucky things about whiskchat x