Bug fixes and styling.