some of jeffs suggestions
fixing spacing