Fixes after review including titles capitalization