Small changes
update comments
correct template matching for subfolders
Add improvements to article generation