Bug fixes

Various fixes to trace back errors
I didn't see the change that made this possible. What made the crashing stop?

Better to just remove this USE_WATERFALL constant if it really is fixed.