Added GHCi and changed some things