Added comments to AD and Changed layouts to match c versions