fixes & HIDE_OUTPUT