tests passing
improving scalaz imports
more scalaz improvements