Quick Update of Bugs

Adding some bugs