cleaned up the templates a bit
minor changes