fixes & template

added some fixes and new template