Fix chaining. Removed some returns. Fixed typos