minor sucsesses
minor changes in templates
minor changes