fix import/macro from spilling globals
add whitespace controls to tags and vars