Untangled the merges
normalizing api format
Minor merge fix