pull cactus & fix redirect