some formatting changes and quiet option