Adding missing import and fixing up tool/hop_runner.dart

light changes and easy merge.