Fixes typos and rewrote parts.
Fix merge conflic