Refinements, updated Documentation