edited the warning about templates and did a little cleanup