Various improvements, simplified plain output dramatically. Everything seems to work.