Bug fixes.
UI improved.
Tests modified.