fixed some examples and renamed some macro parameter names