Clean, BugFixe and Co

... and the last Berk commit.
Resolve  issue #1