rename thunderbirdsareago, reindent, misc