Addresses #46 and #51.
Basic instrumentation, stability fixes, unit test updates, and more