Print stack trace and a few cosmetic changes again.