Jmrunge/24hs

Fixes #133 and other minor issues detected in first stress test.