Bug fixes, cleaned output.