Add a bug fix and a couple file headers