merged from bsd1: reduced noise, backing up correct filename