Bugs Fixed, 1 more to fix