Updated templates, long description and tutorial