christmas snow, plus files I forgot from last commit