Fixed most currently known issues in the template, which had had a lot added to it. A pretty stable version, compared to previos or next a good snapshot.