Fix all the bugs!