Found some bugs @ fixed some bugs