A fix and new bug and we are almost showing!