Bug fixes. Formatting for screen.