Bad Bugs, Go Away

Bug smushing day! 17 changed files with 80 additions and 48 deletions.