fiexd some block parameters, added parametrized types (wip) and some TODOs