Recommended fix ups, additional documentation