bug fixing, adjustements, documentation