Merged some uncommitted documentation