Updated the bugs