added xspace to some macros