BugFixe and documentation improvements