Template for tostring and small fix ups