Updated user macros

Also updated comments