Boolean and rich text macros now take attributes as well; fixed an error with rich text macro