Bugs are all fixed now!