Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems