type definitions are correct now
some duplicate function clauses are removed
version ++
repairing of some warnings