simplify
don't show output here
small fixes