Fix typos / comments
Add $this to multiple methods to allow chaining