Finally... fixed some bugs