Initial commit. Minor updates