Add better BUG debugging and remove BUG from NYET