some extra comments and adjustments