Comment fix & graphic debugs