Bugs Fixed :satisfied: