Fixed some typos, removed unecessary code, small changes.