Updated templates and fixed little bugs.