Minor changes in the code and templates.