Fixed the program name in the help message
Fixed some weird refactoring change