Added submodule Hask
More code improvements