First commit
Minor changes