Adding the sub executable
Minor fixes