include updates from phoul
clarify an issue
nitpick