Fixed some minor bugs and merge typos. Minor cleanup. Bumped version.