Serious Bug fixes. Template 001 was not properly set