Fixed bug
factored new features out.
Updated Runners.