Added warning&note + some slight changes in index