Fixed numerous typos and errors. Changed the abstract a little bit.
Fixed merge conflicts.