fixed all issues and completed the template