Modify everything. Minor tweaking and correcting typos