feature/521: correcting errors + adding templates