Initial commit
Minor updates