Variable cleanup, new Tag processor and other updates