enhance output
small fixes