Some minor changes + template files