[Update] - fixed some bugs.