Ignore . and .., and add ampersands