dump added and some minor  fixes
updates in templates