Change macros to applying when ok is hit. Include global macros although
there is no way to create them yet.
Added minimum command size to store in log.