Few minor code and comment changes to the launcher code.