Fixed some problems, added templates. Attempted adding more names.