More decoupling, use java's type inference (who knew?)
Fix problems with launcher that showed up while refactoring Runner
Further cleanup & bugfixes