clean up whitespace, add multi-tag support

clean up whitespace, add multi-tag support