Added guava - fixed some typos