bringing in some of the last bugs I really care about