Bugfixes and Improvements

This fixes the error introduced into the master branch and should eliminate several artifacts from the previous Runnable implementation that resulted in strange output during teardown.