More bugfixes and styling.