cleanups

• snuffle
• guitars
• Terence
• bunching
• nitpicking
• impish