#3 Bugs were fixed