Fixed a few bugs, removed the unnecessary content that was there.