Minor bugfixes and styling changes.