Bugfixes, cleanups, layout changes.