Removed scalaz dependency, bug fixes.