Miscellaneous cleanup and enhancements

Signatures are still not all complete, and overall structure refactoring is still needed, but I believe this gets things a little bit closer.