small fixes and new template