Made a few changes - thing still hangs once in 24 hours