Minor Changes, commented macros