bsd make adaption
expand: filter out non-terminals
allow empty expand argument
add expand and regex to variable print
rewind comment