Updated.
Some bugs fixed.