Fixed a couple typos and bugs