Initial commit
Minor changes