Added basic loop directive
Added proper watch cleanup