Radically improved. May work on EC2, not yet working locally.