Some more useful printout for verbose mode
Some improvements to template fitting code