some minor extenssions added.