[Update] - some bugs fixed.