Improved templates/minor corrections