remove comments
TAG demo improvements
minors
move stuff around
move stuff around