Got rid of 2 bugs. Squashed em.