Fixing LOTS of typos and a few bugs