Bugfixes.
Visual improvements.