I've corrected the Typo's in the Templates, and added some more specifics to make things nice and clean.