fixes, templates and modules added