corrected case of come variables/macros
fixed bracket space