Compile warnings all but eliminated. Catching needs tweaking.