some fixes and less outputs