Bugfixes & improvements.
More improvements.