name fix, inf loop fix, mustard badge