Added usage
Changed some output formats