small improvements; using the output window less