Added modulo operator and more haskell functions