Reorganize and work on output
More work on output, error messages